bitkeeper revision 1.1159.212.61 (41ff4ae9QGwwPUv_OONjfk2SaSj0dw)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/arch/x86/x86_32/asm-offsets.c
Simple merge

diff --cc xen/arch/x86/x86_32/entry.S
Simple merge

diff --cc xen/include/asm-x86/processor.h
Simple merge